Autogenerated HTML docs for v1.9.0-138-g2de34
diff --git a/git-rebase.html b/git-rebase.html index 7dddc5a..aed5ee0 100644 --- a/git-rebase.html +++ b/git-rebase.html
@@ -1089,6 +1089,17 @@ </p> </dd> <dt class="hdlist1"> +-S[<keyid>] +</dt> +<dt class="hdlist1"> +--gpg-sign[=<keyid>] +</dt> +<dd> +<p> + GPG-sign commits. +</p> +</dd> +<dt class="hdlist1"> -q </dt> <dt class="hdlist1"> @@ -1374,7 +1385,7 @@ merged tree of the common ancestors and uses that as the reference tree for the 3-way merge. This has been reported to result in fewer merge conflicts without - causing mis-merges by tests done on actual merge commits + causing mismerges by tests done on actual merge commits taken from Linux 2.6 kernel development history. Additionally this can detect and handle merges involving renames. This is the default merge strategy when @@ -1961,7 +1972,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-12-27 16:32:55 PST +Last updated 2014-02-27 15:06:29 PST </div> </div> </body>
